Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 23:59:58 +0000 (23:59 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Sun, 8 Aug 2010 23:59:58 +0000 (23:59 +0000)

Trivial merge